Switch license to GPLv3 or later.

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 61975aa6cb8aaf1c9e134666d57c973c86163289..0b1173059c52ad51ea45f0996a9b0873f71fcc7a 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -6233,7 +6233,7 @@
 
   GNU Emacs is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index bef8f1b9c29ba6bf9e3ce521d4dc7e34c08ebe32..1482ea6c5dfb7ac6b271548ab6033637907102ba 100644 (file)
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -6,7 +6,7 @@
 
 # GNU Emacs is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 
 # GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lib-src/b2m.pl b/lib-src/b2m.pl
index 39c5901348f556c082156d4fb35838a3d9965dc3..96f1643891f6661e18b69a9369facbd4153ecf16 100644 (file)
--- a/lib-src/b2m.pl
+++ b/lib-src/b2m.pl
@@ -7,8 +7,8 @@
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
 
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +16,9 @@
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-# USA.
+# along with this program; see the file COPYING.  If not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301 USA.
 
 # Maintained by Jonathan Kamens <jik@kamens.brookline.ma.us>.
 

diff --git a/lib-src/cvtmail.c b/lib-src/cvtmail.c
index f82f877923e1beabe75fe44c0c0b792625b66c8a..d892d77dc5a134f2565a8fb5b66067d7810e3f8f 100644 (file)
--- a/lib-src/cvtmail.c
+++ b/lib-src/cvtmail.c
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lib-src/digest-doc.c b/lib-src/digest-doc.c
index 16d386f5b4ec084131ba4818799dcaa704f4e01a..08e5d8133616dc1b9abd06723862a05da92cd332 100644 (file)
--- a/lib-src/digest-doc.c
+++ b/lib-src/digest-doc.c
@@ -8,7 +8,7 @@
 
    GNU Emacs is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index b1348f8e8410dbef5a62c4bd2c66f5374f85962c..ea230a9c3cdb27733bf05063efd4a9a85c5282c8 100644 (file)
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -7,7 +7,7 @@
 
    GNU Emacs is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index ea1e6cd7af89108235f0d7a3da91fc4ff2044507..9edba132134e16c900eba255e295148a7d01223c 100644 (file)
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lib-src/emacstool.c b/lib-src/emacstool.c
index f04a8b3f545a074d75a705050801d46dd0d1acde..7b39d2ed8fd70d716d8c3c4a3395ac0a03ba331b 100644 (file)
--- a/lib-src/emacstool.c
+++ b/lib-src/emacstool.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lib-src/etags.c b/lib-src/etags.c
index 1d1f16ddf28ff29c9c6522cc4b55497bd9def6f7..6c61847546a724938fadce722d9d9c75aee113c9 100644 (file)
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -36,8 +36,8 @@ This file is not considered part of GNU Emacs.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+the Free Software Foundation; either version 3, or (at your option)
+any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -45,8 +45,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+along with this program; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
 
 
 /* NB To comply with the above BSD license, copyright information is

diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c
index e35c0f8a072130c754f99755cbe72f1fabc458ad..003f2da886c055ce92007b0037bf14c696d15917 100644 (file)
--- a/lib-src/fakemail.c
+++ b/lib-src/fakemail.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lib-src/getopt.c b/lib-src/getopt.c
index b6d6b881de7bdb623b4271f404b5cac83def72d4..587c2e0f618f37c4b39ada633ea3fd658b3fff8c 100644 (file)
--- a/lib-src/getopt.c
+++ b/lib-src/getopt.c
@@ -9,7 +9,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,

diff --git a/lib-src/getopt1.c b/lib-src/getopt1.c
index c2bec4f8e9a55ee9a40ade66ecb8192a22c3a93e..25f616250c1e936bb78ce569864999e419e615d3 100644 (file)
--- a/lib-src/getopt1.c
+++ b/lib-src/getopt1.c
@@ -5,7 +5,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,

diff --git a/lib-src/getopt_.h b/lib-src/getopt_.h
index 377c48375487f7bd8011ec19e8fa02fdc0c7a6e0..7cccef3eeea24c5efd8b311795c8fad227b65eea 100644 (file)
--- a/lib-src/getopt_.h
+++ b/lib-src/getopt_.h
@@ -5,7 +5,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,

diff --git a/lib-src/getopt_int.h b/lib-src/getopt_int.h
index 25df3bbcfdcc26605067272ecd8842b07ec26272..049f47629006df90cb081c366bb48544a994c558 100644 (file)
--- a/lib-src/getopt_int.h
+++ b/lib-src/getopt_int.h
@@ -5,7 +5,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,

diff --git a/lib-src/gettext.h b/lib-src/gettext.h
index ed32900384340f2dbe3469c5a85eff180bff80f6..4a5941f86dc92068dcdc6b4b52d8bf0bc0153e93 100644 (file)
--- a/lib-src/gettext.h
+++ b/lib-src/gettext.h
@@ -4,7 +4,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,

diff --git a/lib-src/grep-changelog b/lib-src/grep-changelog
index d2e9ecfd7eefb011e976ec17bd515574a1460e95..1dff1e3e6b7310a15f7460117685b35db41174c9 100755 (executable)
--- a/lib-src/grep-changelog
+++ b/lib-src/grep-changelog
@@ -7,7 +7,7 @@
 #
 # GNU Emacs is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
 # GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lib-src/hexl.c b/lib-src/hexl.c
index 7cabdc95a6640d13614c47688a60028de34793fc..98561cf604de789dba4a9e0006dd1d4609f6176b 100644 (file)
--- a/lib-src/hexl.c
+++ b/lib-src/hexl.c
@@ -6,8 +6,8 @@ This file is not considered part of GNU Emacs.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+the Free Software Foundation; either version 3, or (at your option)
+any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+along with this program; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>

diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index d76bdd527cf778283cc2d4034a11961886aee13c..3f3da3e700747b87a53a49986a8472e5b043c938 100644 (file)
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index b552160c759189d6b0e6c41fbb74019dc3836279..3076b85dbd8ad954c2ec3039812ff00910b2c45b 100644 (file)
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -6,7 +6,7 @@
 #
 #  GNU Emacs is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
+#  the Free Software Foundation; either version 3, or (at your option)
 #  any later version.
 #
 #  GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 84d4f949b2faecfa7639deda144f5ddf3ddd61f1..aaaf91b1b1fc2c0046de34d09625e0afb227efc0 100644 (file)
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c
index 5f6c12abcebf2cbc54440f9e3028e30fc664d389..e11733f96058bd57e1cac431aa0fb6c3a5bb88f4 100644 (file)
--- a/lib-src/ntlib.c
+++ b/lib-src/ntlib.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h
index a5655519fe1be9082c1650ab0f4426df885141e4..267e8ba5a04f04d4cc16c1a112d70c72b2106d42 100644 (file)
--- a/lib-src/ntlib.h
+++ b/lib-src/ntlib.h
@@ -6,7 +6,7 @@
 
    GNU Emacs is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2, or (at your option) any later
+   Free Software Foundation; either version 3, or (at your option) any later
    version.
 
    GNU Emacs is distributed in the hope that it will be useful, but WITHOUT

diff --git a/lib-src/pop.c b/lib-src/pop.c
index a829607faa5bfabf340a45c82aec8d7b3d866abc..9fcbe4b370cdc3c2744e24005c11785860ec7d05 100644 (file)
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lib-src/pop.h b/lib-src/pop.h
index 664fb26f7db974c0b895fa7710915ebcd3685908..85b666c652f542f75ba0b1e9d69c01f04afdbbb4 100644 (file)
--- a/lib-src/pop.h
+++ b/lib-src/pop.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lib-src/profile.c b/lib-src/profile.c
index 1174666da7836196edb925c1414c8a07f359e97f..628b72ddcfe9ef5a8301cb241b178f4050fb6e11 100644 (file)
--- a/lib-src/profile.c
+++ b/lib-src/profile.c
@@ -8,7 +8,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lib-src/rcs-checkin b/lib-src/rcs-checkin
index 1ec783934e69afb1fd9c9665e648c9dd1ea853fb..94396709e653b3a6a4927233dd3232c86cd763b8 100755 (executable)
--- a/lib-src/rcs-checkin
+++ b/lib-src/rcs-checkin
@@ -9,7 +9,7 @@
 #
 # GNU Emacs is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
 # GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lib-src/rcs2log b/lib-src/rcs2log
index 371a52de66c5e386fc91696533cb16bbc630c524..c81f51d4d6095f71238f89d57879438c1fa765cf 100755 (executable)
--- a/lib-src/rcs2log
+++ b/lib-src/rcs2log
@@ -59,7 +59,7 @@ Id='$Id$'
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
 # This program is distributed in the hope that it will be useful,

diff --git a/lib-src/sorted-doc.c b/lib-src/sorted-doc.c
index 28f736ab8439281d93daccfbf44d1e1924354439..e239eaab428d4c4951117b4eb859b6cdb625287d 100644 (file)
--- a/lib-src/sorted-doc.c
+++ b/lib-src/sorted-doc.c
@@ -8,7 +8,7 @@
 
    GNU Emacs is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lib-src/test-distrib.c b/lib-src/test-distrib.c
index cd504c8c5388b11ce51428dadc0f7e6423d3f583..4913f0946146821bd7e42bf950b00601abca4352 100644 (file)
--- a/lib-src/test-distrib.c
+++ b/lib-src/test-distrib.c
@@ -7,7 +7,7 @@
 
    GNU Emacs is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c
index 9f1c011ce79b53af3deee914bdad41d496ad0273..3ccfecdb7d7459f025a207e277a4e699391873e2 100644 (file)
--- a/lib-src/update-game-score.c
+++ b/lib-src/update-game-score.c
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lib-src/vcdiff b/lib-src/vcdiff
index 21c6e70e9d8db0ce2d94ea1d4da791da9142a3b1..4fd6fb47226e59c7f41a51861caf0933debdbd79 100755 (executable)
--- a/lib-src/vcdiff
+++ b/lib-src/vcdiff
@@ -10,7 +10,7 @@
 #
 # GNU Emacs is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
 # GNU Emacs is distributed in the hope that it will be useful,